Merge branch 'upstream'
authorJulien Cristau <julien.cristau@ens-lyon.org>
Sat, 2 Sep 2006 09:24:33 +0000 (09:24 +0000)
committerJulien Cristau <julien.cristau@ens-lyon.org>
Sat, 2 Sep 2006 09:24:33 +0000 (09:24 +0000)
commit6e2f247c2a98a918561391340013875e34ee8a91
treede1e29ffe126488c046a6348f6eaea4bcf59f528
parent0f07fd7abcd77b6ed949252e4d56d10f8fd1c90a
parent00cfa39e0998c1e75ef22fa9928b88c35869ad47
Merge branch 'upstream'